Repository navigation
Fix Catalog.is_identical for context-specific messages - #1428
Merged
Merged
Conversation
is_identical() iterates the internal _messages keys, but looked each one up through Catalog.get(). For a context-specific message that key is a (msgid, msgctxt) tuple, and get() re-runs _key_for() on it, which takes a tuple for a pluralizable message's id and reduces it to msgid alone -- a key no message is stored under. The lookup returned None, so any catalog containing a msgctxt never compared equal, not even to itself. The visible consequence is that pybabel update --check reports every catalog using pgettext/npgettext as out of date on every run, which makes it unusable as the CI staleness gate it was added for (#831). Index _messages directly, since the keys being iterated are its own. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Co-Authored-By: Aarni Koskela <akx@iki.fi>
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #1428 +/- ##
=======================================
Coverage 93.65% 93.65%
=======================================
Files 27 27
Lines 4962 4964 +2
=======================================
+ Hits 4647 4649 +2
Misses 315 315
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
There was a problem hiding this comment.
🟢 Approval recommended
The catalog identity lookup correction is accompanied by regression coverage for contextual singular and pluralizable messages, addressing the reported false staleness behavior.
No open issues 🎉
What changed in this PR
Fixes Catalog.is_identical() for context-specific and pluralizable messages by using stored internal keys directly, preventing false staleness reports from pybabel update --check.
Changes:
- Corrects contextual message lookup during catalog identity comparisons.
- Adds regression coverage for contextual singular and pluralizable messages.
| File | Description |
|---|---|
tests/messages/test_catalog.py |
Adds regression coverage for context-specific catalog comparisons. |
babel/messages/catalog.py |
Corrects message lookup during catalog identity comparisons. |
Review effort: Lite
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
is_identical() iterates the internal _messages keys, but looked each one up through Catalog.get(). For a context-specific message that key is a (msgid, msgctxt) tuple, and get() re-runs _key_for() on it, which takes a tuple for a pluralizable message's id and reduces it to msgid alone -- a key no message is stored under. The lookup returned None, so any catalog containing a msgctxt never compared equal, not even to itself.
The visible consequence is that pybabel update --check reports every catalog using pgettext/npgettext as out of date on every run, which makes it unusable as the CI staleness gate it was added for (#831).
Index _messages directly, since the keys being iterated are its own.
Fixes #1307
Closes #1308 (supersedes it)